qt6 compatibility changes. (#674)
authortsteven4 <13596209+tsteven4@users.noreply.github.com>
Sat, 30 Jan 2021 23:27:27 +0000 (16:27 -0700)
committerGitHub <noreply@github.com>
Sat, 30 Jan 2021 23:27:27 +0000 (16:27 -0700)
QDateTime::toTime_t has been obsolete for a long time, it is gone
in Qt6.

jtr.cc

diff --git a/jtr.cc b/jtr.cc
index 7ae83190a862aa5ec6d3b8e27ad33460402f734c..fd5167ec6566b4ab413e489c3074ad53b9ebfb1e 100644 (file)
--- a/jtr.cc
+++ b/jtr.cc
@@ -100,7 +100,6 @@ jtr_read()
     char valid = 'V';
     double lon;
     float course, mcourse, mvar, mdev;
-    char buf[32];
     char mdevdir;
 
     line++;
@@ -188,8 +187,11 @@ jtr_read()
     QDateTime dt = QDateTime(date, time, Qt::UTC);
 
     /* check for duplicates as suggested in format description */
-    snprintf(buf, sizeof(buf), "%.6f\01%.6f\01%ld", lat, lon, (long)dt.toTime_t());
-    if (trkpts.contains(QString::fromUtf8(buf))) {
+    QString buf = QString("%1\01%2\01%3")
+                  .arg(QString::number(lat, 'f', 6),
+                       QString::number(lon, 'f', 6),
+                       QString::number(dt.toSecsSinceEpoch()));
+    if (trkpts.contains(buf)) {
       continue;
     }
 
@@ -227,7 +229,7 @@ jtr_read()
       track_add_head(trk);
     }
 
-    trkpts.insert(QString::fromUtf8(buf), wpt);
+    trkpts.insert(buf, wpt);
     track_add_wpt(trk, wpt);
   }
 }